Revision: tla--devo--1.1--patch-21
Archive: arch@repose.cx--03
Creator: Damien Elmes <arch@repose.cx>
Date: Sat Aug 23 22:03:09 EST 2003
Standard-date: 2003-08-23 12:03:09 GMT
Summary: merge w/ lord
Keywords:
New-files: 
New-directories: 
Removed-files: 
Removed-directories: 
Renamed-files: 
Renamed-directories: 
Modified-files: ./ChangeLog ./libarch/ancestry.c
    ./libarch/ancestry.h ./libarch/archive-setup.c
    ./libarch/archives.c ./libarch/changeset-report.c
    ./libarch/cmd-abrowse.c ./libarch/cmd-ancestry-graph.c
    ./libarch/cmd-ancestry-graph.h
    ./libarch/cmd-default-tag.c ./libarch/cmd-deltapatch.c
    ./libarch/cmd-file-diffs.c ./libarch/cmd-help.c
    ./libarch/cmd-init-tree.c ./libarch/cmd-ls-archives.c
    ./libarch/cmd-make-log.c ./libarch/cmd-merges.c
    ./libarch/cmd-register-archive.c ./libarch/cmd-replay.c
    ./libarch/cmd-revdelta.c ./libarch/cmd-star-merge.c
    ./libarch/cmd-star-merge.h ./libarch/cmd-what-changed.c
    ./libarch/cmds.c ./libarch/cmds.h ./libarch/exec.c
    ./libarch/exec.h ./libarch/make-changeset.c
    ./libarch/merge-points.c ./libarch/merge-points.h
    ./libarch/patch-logs.c ./libarch/pfs-dav.c
    ./libarch/pfs-ftp.c ./libarch/pfs-sftp.c
    ./libarch/pristines.c ./libarch/star-merge.c
    ./libarch/star-merge.h ./libarch/tag.c
    ./libneon/Makefile.in
Modified-directories: 
New-patches: alexander@deruwe.be--2003/tla--aderuwe--1.0--patch-173
    alexander@deruwe.be--2003/tla--aderuwe--1.1--base-0
    alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-1
    alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-2
    alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-3
    alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-4
    alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-5
    alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-6
    alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-7
    alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-8
    alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-9
    alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-10
    alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-11
    alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-12
    alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-13
    alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-14
    alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-15
    alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-16
    alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-17
    arch@repose.cx--03/tla--devo--1.1--patch-21
    christopher.gray@mail.mcgill.ca--archive-ubc/tla--bugfixes--1.0--base-0
    christopher.gray@mail.mcgill.ca--archive-ubc/tla--bugfixes--1.0--patch-1
    ed.gomez@free.fr--2003-1/tla--edgomez--1.1--patch-10
    ed.gomez@free.fr--2003-1/tla--edgomez--1.1--patch-11
    ed.gomez@free.fr--2003-1/tla--edgomez--1.1--patch-12
    ed.gomez@free.fr--2003-1/tla--edgomez--1.1--patch-13
    ed.gomez@free.fr--2003-1/tla--edgomez--1.1--patch-14
    ed.gomez@free.fr--2003-1/tla--edgomez--1.1--patch-15
    jblack@merconline.com--2003/tla--devo--1.1--patch-24
    jblack@merconline.com--2003/tla--devo--1.1--patch-25
    jblack@merconline.com--2003/tla--devo--1.1--patch-26
    jblack@merconline.com--2003/tla--devo--1.1--patch-27
    jblack@merconline.com--2003/tla--devo--1.1--patch-28
    jblack@merconline.com--2003/tla--devo--1.1--patch-29
    jblack@merconline.com--2003/tla--devo--1.1--patch-30
    jblack@merconline.com--2003/tla--devo--1.1--patch-31
    jblack@merconline.com--2003/tla--devo--1.1--patch-32
    jblack@merconline.com--2003/tla--devo--1.1--patch-33
    jblack@merconline.com--2003/tla--devo--1.1--patch-34
    jblack@merconline.com--2003/tla--devo--1.1--patch-35
    jblack@merconline.com--2003/tla--devo--1.1--patch-36
    jblack@merconline.com--2003/tla--devo--1.1--patch-37
    jblack@merconline.com--2003/tla--tla-devo-lsarchives-regex--1.1--base-0
    jblack@merconline.com--2003/tla--tla-devo-lsarchives-regex--1.1--patch-1
    lord@emf.net--2003b/tla--devo--1.1--patch-118
    lord@emf.net--2003b/tla--devo--1.1--patch-119
    lord@emf.net--2003b/tla--devo--1.1--patch-120
    lord@emf.net--2003b/tla--devo--1.1--patch-121
    lord@emf.net--2003b/tla--devo--1.1--patch-122
    lord@emf.net--2003b/tla--devo--1.1--patch-123
    lord@emf.net--2003b/tla--devo--1.1--patch-124
    lord@emf.net--2003b/tla--devo--1.1--patch-125
    lord@emf.net--2003b/tla--devo--1.1--patch-126
    lord@emf.net--2003b/tla--devo--1.1--patch-127
    lord@emf.net--2003b/tla--devo--1.1--patch-128
    lord@emf.net--2003b/tla--devo--1.1--patch-129
    lord@emf.net--2003b/tla--devo--1.1--patch-130
    lord@emf.net--2003b/tla--devo--1.1--patch-131
    lord@emf.net--2003b/tla--small-fixes--1.1--patch-17
    lord@emf.net--2003b/tla--small-fixes--1.1--patch-18
    lord@emf.net--2003b/tla--small-fixes--1.1--patch-19
    lord@emf.net--2003b/tla--small-fixes--1.1--patch-20
    lord@emf.net--2003b/tla--small-fixes--1.1--patch-21
    lord@emf.net--2003b/tla--small-fixes--1.1--patch-22
    lord@emf.net--2003b/tla--small-fixes--1.1--patch-23
    lord@emf.net--2003b/tla--small-fixes--1.1--patch-24
    lord@emf.net--2003b/tla--small-fixes--1.1--patch-25
    lord@emf.net--2003b/tla--small-fixes--1.1--patch-26
    lord@emf.net--2003b/tla--small-fixes--1.1--patch-27
    lord@emf.net--2003b/tla--small-fixes--1.1--patch-28
    lord@emf.net--2003b/tla--small-fixes--1.1--patch-29
    lord@emf.net--2003b/tla--small-fixes--1.1--patch-30
    lord@emf.net--2003b/tla--small-fixes--1.1--patch-31
    mirian@cosmic.com--2003/tla--cosmic--1.1--base-0
    mirian@cosmic.com--2003/tla--cosmic--1.1--patch-1
    mt@wmipf.in-berlin.de--devel-2003/tla--wmipf--1.1--patch-10
    mt@wmipf.in-berlin.de--devel-2003/tla--wmipf--1.1--patch-11
    mt@wmipf.in-berlin.de--devel-2003/tla--wmipf--1.1--patch-13
    sam@rfc1149.net--public/tla--sam--1.1--base-0
    sam@rfc1149.net--public/tla--sam--1.1--patch-1
    stig@brautaset.org--2003/tla--stig--1.1--base-0
    stig@brautaset.org--2003/tla--stig--1.1--patch-1
    stig@brautaset.org--2003/tla--stig--1.1--patch-2
    stig@brautaset.org--2003/tla--stig--1.1--patch-3
    stig@brautaset.org--2003/tla--stig--1.1--patch-4
Removed-patches: 

merge w/ lord

Patches applied:

 * alexander@deruwe.be--2003/tla--aderuwe--1.0--patch-173
   remove stray tabs/spaces in libarch/exec.*

 * alexander@deruwe.be--2003/tla--aderuwe--1.1--base-0
   tag of lord@emf.net--2003b/tla--devo--1.1--patch-92

 * alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-1
   cherrypick a whitespace cleanup from tla--aderuwe--1.0

 * alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-2
   remove stray tabs/spaces in libarch/archive-setup.c

 * alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-3
   remove stray tabs/spaces in libarch/archives.c

 * alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-4
   remove stray tabs/spaces in libarch/changeset-report.c

 * alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-5
   remove stray tabs/spaces in libarch/cmd-make-log.c

 * alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-6
   remove stray tabs/spaces in libarch/cmd-replay.c

 * alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-7
   remove stray tabs/spaces in libarch/cmd-what-changed.c

 * alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-8
   remove stray tabs/spaces in libarch/star-merge.c

 * alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-9
   remove stray tabs/spaces in libarch/ancestry.c

 * alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-10
   remove stray tabs/spaces in libarch/cmd-ancestry.c

 * alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-11
   remove stray tabs/spaces in libarch/cmd-star-merge.c

 * alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-12
   remove stray tabs/spaces in libarch/ancestry.h

 * alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-13
   remove stray tabs/spaces in libarch/cmd-ancestry.h

 * alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-14
   remove stray tabs/spaces in libarch/cmd-star-merge.h

 * alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-15
   remove stray tabs/spaces in libarch/make-changeset.c

 * alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-16
   remove stray tabs/spaces in libarch/patch-logs.c

 * alexander@deruwe.be--2003/tla--aderuwe--1.1--patch-17
   remove stray tabs/spaces in libarch/star-merge.h

 * christopher.gray@mail.mcgill.ca--archive-ubc/tla--bugfixes--1.0--base-0
   tag of lord@emf.net--2003b/tla--devo--1.1--patch-127

 * christopher.gray@mail.mcgill.ca--archive-ubc/tla--bugfixes--1.0--patch-1
   arch_find_pristine bug fix to prevent EACCESS panic

 * ed.gomez@free.fr--2003-1/tla--edgomez--1.1--patch-10
   cmd-register-archive help message fixed + archive's name printing.

 * ed.gomez@free.fr--2003-1/tla--edgomez--1.1--patch-11
   Fixes modified patch file name in diff output.

 * ed.gomez@free.fr--2003-1/tla--edgomez--1.1--patch-12
   Synced with tomlord patch-123

 * ed.gomez@free.fr--2003-1/tla--edgomez--1.1--patch-13
   Cosmetic chnages to the star-merge help message -- more 80x25 terminal friendly

 * ed.gomez@free.fr--2003-1/tla--edgomez--1.1--patch-14
   Add some text initialization where it was appropriate

 * ed.gomez@free.fr--2003-1/tla--edgomez--1.1--patch-15
   Synced with tom's branch patch-127

 * jblack@merconline.com--2003/tla--devo--1.1--patch-24
   Fixed star-merge example merging graph

 * jblack@merconline.com--2003/tla--devo--1.1--patch-25
   Large number of additions to the glossary (Thanks Tom)

 * jblack@merconline.com--2003/tla--devo--1.1--patch-26
   moved the glossary entry to a place that I think more sense

 * jblack@merconline.com--2003/tla--devo--1.1--patch-27
   Star merged from tom

 * jblack@merconline.com--2003/tla--devo--1.1--patch-28
   Adding depreciated option to tla help

 * jblack@merconline.com--2003/tla--devo--1.1--patch-29
   Mispelled arch_commands

 * jblack@merconline.com--2003/tla--devo--1.1--patch-30
   Just found out arg0 of safe_printfmt is the filehandle to print to in depreciated prints

 * jblack@merconline.com--2003/tla--devo--1.1--patch-31
   depreciated has been deprecated in favor of deprecated

 * jblack@merconline.com--2003/tla--devo--1.1--patch-32
   Printing deprecation at wrong place

 * jblack@merconline.com--2003/tla--devo--1.1--patch-33
   tla help with deprecated now works

 * jblack@merconline.com--2003/tla--devo--1.1--patch-34
   Merged in from Tom. Light conflicts in libarch/cmds.c

 * jblack@merconline.com--2003/tla--devo--1.1--patch-35
   Star-merged Tom's 7/24 merge storm

 * jblack@merconline.com--2003/tla--devo--1.1--patch-36
   Star merged from Tom again. Does he ever give up on this patching thing?

 * jblack@merconline.com--2003/tla--devo--1.1--patch-37
   Imported change to ls_archives that allows one to ls-archives [regular expression]

 * jblack@merconline.com--2003/tla--tla-devo-lsarchives-regex--1.1--base-0
   tag of jblack@merconline.com--2003/tla--devo--1.1--patch-35

 * jblack@merconline.com--2003/tla--tla-devo-lsarchives-regex--1.1--patch-1
   Added regex searching to ls-archives

 * lord@emf.net--2003b/tla--devo--1.1--patch-118
   small-fixes: merge help and file-diffs fixes from ed.gomez

 * lord@emf.net--2003b/tla--devo--1.1--patch-119
   small-fixes: deprecated flag for commands (jblack)

 * lord@emf.net--2003b/tla--devo--1.1--patch-120
   small-fixes: replay help message fix (Sam Tardieu)

 * lord@emf.net--2003b/tla--devo--1.1--patch-121
   small-fixes: update/deltapatch bug fixes (mt@wmipf)

 * lord@emf.net--2003b/tla--devo--1.1--patch-122
   small-fixes: whitespace fixes from Alexander

 * lord@emf.net--2003b/tla--devo--1.1--patch-123
   small-fixes: minor abrowse fixes

 * lord@emf.net--2003b/tla--devo--1.1--patch-124
   sync-tree with jblack past doc patches that wound up on a different project

 * lord@emf.net--2003b/tla--devo--1.1--patch-125
   small-fixes: ls-archives regexp feature (jblack)

 * lord@emf.net--2003b/tla--devo--1.1--patch-126
   small-fixes: prevent tagging non-existent revs and compute new-patches right in tag

 * lord@emf.net--2003b/tla--devo--1.1--patch-127
   small-fixes: minor fixes

 * lord@emf.net--2003b/tla--devo--1.1--patch-128
   [small-fixes] help and error message fixes from ed.gomez

 * lord@emf.net--2003b/tla--devo--1.1--patch-129
   [small-fixes] arch_find_pristine bug fix (cgray)

 * lord@emf.net--2003b/tla--devo--1.1--patch-130
   [small-fixes] solaris build fixes and help msg fix (stig)

 * lord@emf.net--2003b/tla--devo--1.1--patch-131
   [small-fixes] default-tag bug fix (mirian)

 * lord@emf.net--2003b/tla--small-fixes--1.1--patch-17
   merge help and file-diffs fixes from ed.gomez

 * lord@emf.net--2003b/tla--small-fixes--1.1--patch-18
   deprecated flag for commands (jblack)

 * lord@emf.net--2003b/tla--small-fixes--1.1--patch-19
   replay help message fix (Sam Tardieu)

 * lord@emf.net--2003b/tla--small-fixes--1.1--patch-20
   update/deltapatch bug fixes (mt@wmipf)

 * lord@emf.net--2003b/tla--small-fixes--1.1--patch-21
   whitespace fixes from Alexander

 * lord@emf.net--2003b/tla--small-fixes--1.1--patch-22
   minor abrowse fixes

 * lord@emf.net--2003b/tla--small-fixes--1.1--patch-23
   ls-archives regexp feature (jblack)

 * lord@emf.net--2003b/tla--small-fixes--1.1--patch-24
   fix nits in ls-archives regex support

 * lord@emf.net--2003b/tla--small-fixes--1.1--patch-25
   prevent tagging non-existent revs and compute new-patches right in tag

 * lord@emf.net--2003b/tla--small-fixes--1.1--patch-26
   add test target to libneon (again!?!?)

 * lord@emf.net--2003b/tla--small-fixes--1.1--patch-27
   fix a compiler warning

 * lord@emf.net--2003b/tla--small-fixes--1.1--patch-28
   help and error message fixes from ed.gomez

 * lord@emf.net--2003b/tla--small-fixes--1.1--patch-29
   arch_find_pristine bug fix (cgray)

 * lord@emf.net--2003b/tla--small-fixes--1.1--patch-30
   solaris build fixes and help msg fix (stig)

 * lord@emf.net--2003b/tla--small-fixes--1.1--patch-31
   default-tag bug fix (mirian)

 * mirian@cosmic.com--2003/tla--cosmic--1.1--base-0
   tag of lord@emf.net--2003b/tla--devo--1.1--patch-127

 * mirian@cosmic.com--2003/tla--cosmic--1.1--patch-1
   fixed error in conditional

 * mt@wmipf.in-berlin.de--devel-2003/tla--wmipf--1.1--patch-10
   merge with lord (devo)

 * mt@wmipf.in-berlin.de--devel-2003/tla--wmipf--1.1--patch-11
   fixed revdelta's changeset directory option, related fix in deltapatch

 * mt@wmipf.in-berlin.de--devel-2003/tla--wmipf--1.1--patch-13
   propagate default archive name to getrev and revdelta

 * sam@rfc1149.net--public/tla--sam--1.1--base-0
   tag of lord@emf.net--2003b/tla--devo--1.1--patch-104

 * sam@rfc1149.net--public/tla--sam--1.1--patch-1
   Fix help message

 * stig@brautaset.org--2003/tla--stig--1.1--base-0
   tag of lord@emf.net--2003b/tla--devo--1.1--patch-127

 * stig@brautaset.org--2003/tla--stig--1.1--patch-1
   remove lord's changelog and add mine instead

 * stig@brautaset.org--2003/tla--stig--1.1--patch-2
   fix init-tree --nested help message

 * stig@brautaset.org--2003/tla--stig--1.1--patch-3
   replace strsep() with str_separate() from hackerlab in pfs-sftp.c

 * stig@brautaset.org--2003/tla--stig--1.1--patch-4
   replace strsep() with hackerlab's equivalent in pfs-dav.c

